From: Kim F. Storm <storm@cua.dk>
Date: Tue, 17 Feb 2004 21:36:00 +0000 (+0000)
Subject: (get_window_cursor_type): Don't look at glyph if NULL.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~24022
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a91d92eb9c1da9f6d9cf3c2c9c591abc704e676d;p=emacs.git

(get_window_cursor_type): Don't look at glyph if NULL.
(display_and_set_cursor): Set glyph to NULL if cursor in fringe.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 93a90dafdfe..0967041f3b6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19029,7 +19029,7 @@ get_window_cursor_type (w, glyph, width, active_cursor)
     cursor_type = get_specified_cursor_type (b->cursor_type, width);
 
   /* Use normal cursor if not blinked off.  */
-  if (!w->cursor_off_p)
+  if (!w->cursor_off_p && glyph != NULL)
     {
       if (glyph->type == IMAGE_GLYPH) {
 	if (cursor_type == FILLED_BOX_CURSOR)
@@ -19368,7 +19368,8 @@ display_and_set_cursor (w, on, hpos, vpos, x, y)
 
   current_glyphs = w->current_matrix;
   glyph_row = MATRIX_ROW (current_glyphs, vpos);
-  glyph = glyph_row->glyphs[TEXT_AREA] + hpos;
+  glyph = (glyph_row->cursor_in_fringe_p ? NULL
+	   : glyph_row->glyphs[TEXT_AREA] + hpos);
 
   /* If cursor row is not enabled, we don't really know where to
      display the cursor.  */